Don't undefine HAVE_MONITOR_INFO when compiling with gcc. Mingw's headers

2004-03-13  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkdisplay-win32.c: Don't undefine HAVE_MONITOR_INFO
	when compiling with gcc. Mingw's headers do have the required
	definitions.

	* gdk/win32/gdkdrawable-win32.c (draw_polygon): When drawing
	filled polygons, don't draw the outline, similarily as
	draw_rectangle(). Apparently GTK and GIMP don't use
	gdk_draw_polygon() much (or always draw the outline, too), as this
	has gone undetected for so long. Thanks to Bruce Hochstetler.

diff --git a/ChangeLog b/ChangeLog
index a63c1247f41efa9ed7306b9acbea536b6d215fbc..2358b18c77a80924c78f431be80283fb3fa25e90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-03-13  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Don't undefine HAVE_MONITOR_INFO
+       when compiling with gcc. Mingw's headers do have the required
+       definitions.
+
+       * gdk/win32/gdkdrawable-win32.c (draw_polygon): When drawing
+       filled polygons, don't draw the outline, similarily as
+       draw_rectangle(). Apparently GTK and GIMP don't use
+       gdk_draw_polygon() much (or always draw the outline, too), as this
+       has gone undetected for so long. Thanks to Bruce Hochstetler.
+
 Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_destroy): Remove

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a63c1247f41efa9ed7306b9acbea536b6d215fbc..2358b18c77a80924c78f431be80283fb3fa25e90 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2004-03-13  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Don't undefine HAVE_MONITOR_INFO
+       when compiling with gcc. Mingw's headers do have the required
+       definitions.
+
+       * gdk/win32/gdkdrawable-win32.c (draw_polygon): When drawing
+       filled polygons, don't draw the outline, similarily as
+       draw_rectangle(). Apparently GTK and GIMP don't use
+       gdk_draw_polygon() much (or always draw the outline, too), as this
+       has gone undetected for so long. Thanks to Bruce Hochstetler.
+
 Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_destroy): Remove

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a63c1247f41efa9ed7306b9acbea536b6d215fbc..2358b18c77a80924c78f431be80283fb3fa25e90 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+2004-03-13  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Don't undefine HAVE_MONITOR_INFO
+       when compiling with gcc. Mingw's headers do have the required
+       definitions.
+
+       * gdk/win32/gdkdrawable-win32.c (draw_polygon): When drawing
+       filled polygons, don't draw the outline, similarily as
+       draw_rectangle(). Apparently GTK and GIMP don't use
+       gdk_draw_polygon() much (or always draw the outline, too), as this
+       has gone undetected for so long. Thanks to Bruce Hochstetler.
+
 Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_destroy): Remove

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a63c1247f41efa9ed7306b9acbea536b6d215fbc..2358b18c77a80924c78f431be80283fb3fa25e90 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2004-03-13  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Don't undefine HAVE_MONITOR_INFO
+       when compiling with gcc. Mingw's headers do have the required
+       definitions.
+
+       * gdk/win32/gdkdrawable-win32.c (draw_polygon): When drawing
+       filled polygons, don't draw the outline, similarily as
+       draw_rectangle(). Apparently GTK and GIMP don't use
+       gdk_draw_polygon() much (or always draw the outline, too), as this
+       has gone undetected for so long. Thanks to Bruce Hochstetler.
+
 Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_destroy): Remove

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a63c1247f41efa9ed7306b9acbea536b6d215fbc..2358b18c77a80924c78f431be80283fb3fa25e90 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2004-03-13  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Don't undefine HAVE_MONITOR_INFO
+       when compiling with gcc. Mingw's headers do have the required
+       definitions.
+
+       * gdk/win32/gdkdrawable-win32.c (draw_polygon): When drawing
+       filled polygons, don't draw the outline, similarily as
+       draw_rectangle(). Apparently GTK and GIMP don't use
+       gdk_draw_polygon() much (or always draw the outline, too), as this
+       has gone undetected for so long. Thanks to Bruce Hochstetler.
+
 Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_destroy): Remove

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 4ecd1bb8ec1aaee50f38378db78cdbb1d0d0b780..28510dd1554f6e4a5af6f976436952baf8b51dec 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -26,7 +26,7 @@
 
 #if defined(_MSC_VER) && (WINVER < 0x500) && (WINVER > 0x0400)
 #include <multimon.h>
-#elif (WINVER <= 0x0400)
+#elif defined(_MSC_VER) && (WINVER <= 0x0400)
 #undef HAVE_MONITOR_INFO
 #endif
 

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index a0ebf5e5642095ae5c6eccc561c48030da43b8e6..026e1ac2d203f37de05c9dc2ced199ae44b1524d 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -906,6 +906,7 @@ draw_polygon (GdkGCWin32 *gcwin32,
 {
   gboolean filled;
   POINT *pts;
+  HPEN old_pen;
   gint npoints;
   gint i;
 
@@ -921,7 +922,14 @@ draw_polygon (GdkGCWin32 *gcwin32,
       }
 
   if (filled)
-    GDI_CALL (Polygon, (hdc, pts, npoints));
+    {
+      old_pen = SelectObject (hdc, GetStockObject (NULL_PEN));
+      if (old_pen == NULL)
+       WIN32_GDI_FAILED ("SelectObject");
+      GDI_CALL (Polygon, (hdc, pts, npoints));
+      if (old_pen != NULL)
+       GDI_CALL (SelectObject, (hdc, old_pen));
+    }
   else
     GDI_CALL (Polyline, (hdc, pts, npoints));
 }